Merge from trunk.

diff --cc lib-src/ChangeLog
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/lisp.h
Simple merge